Merged.
authoremellor@ewan <emellor@ewan>
Tue, 4 Oct 2005 10:29:36 +0000 (11:29 +0100)
committeremellor@ewan <emellor@ewan>
Tue, 4 Oct 2005 10:29:36 +0000 (11:29 +0100)
commit6edcc99481153a6aad39a7dd098264244d8d8f48
tree10281a320cd451fbdbfc4aafe407b257618c1505
parentc8d3c0d2435a0989e05df3e9fdb663d08f293952
Merged.

Signed-off-by: Ewan Mellor <ewan@xensource.com>